Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testing environment, attempt to use new formula format #44

Merged
merged 7 commits into from
May 28, 2019

Conversation

javierbertoli
Copy link
Member

No description provided.

@javierbertoli javierbertoli requested a review from myii May 24, 2019 20:40
Copy link
Member

@myii myii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good so far! Just a couple of passing comments for the time being.

- INSTANCE: repositories-debian-9-2019-2-py3
- INSTANCE: repositories-ubuntu-1804-2019-2-py3
- INSTANCE: preferences-debian-9-2019-2-py3
- INSTANCE: preferences-ubuntu-1804-2019-2-py3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any plan for debian-8 and/or ubuntu-1604?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't see a valid reason to add them, as the files managed in this formula have not changed in a noticeable way.

kitchen.yml Outdated
- apt.repositories
- apt.update
pillars_from_files:
apt.sls: test/integration/repositories/pillar.sls
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In terms of these pillars_from_files paths (including the one below), goes back to these discussions we had on Slack with @daks:

No way am I suggesting that we should continue with that. But it would be nice to work towards a standard that can be recommended across formulas.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the idea is to use test/salt/{pillar, states}/ directories to store salt data used for tests

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@myii
Copy link
Member

myii commented May 25, 2019

A few other points to consider if overhauling this formula (not part of the current changeset). Found these while comparing to the template-formula:

  1. Include docs/CONTRIBUTING.rst (except the last section which is excluded).
  2. Move to docs/README.rst and update accordingly.
  3. Add the header to pillar.example.

Can always leave these for another PR.

@daks
Copy link
Member

daks commented May 26, 2019

Nice job @javierbertoli :)

* Use latest pre-salted images
* Move from serverspec to inspec
* Fix failing tests
* Use the correct keyring for the OS (a refactor of the changes suggested in saltstack-formulas#41)
* Update docs
* Add auxiliar scripts
* Add missing headers
@myii
Copy link
Member

myii commented May 27, 2019

@javierbertoli Could we do anything to avoid the conflicts with #45, which is the follow-on from #41?

@myii myii mentioned this pull request May 27, 2019
@myii
Copy link
Member

myii commented May 27, 2019

@javierbertoli Thanks for the changes, this is ready to merge for me, except for the decision about the conflict with #45. What's the plan for that?

@javierbertoli
Copy link
Member Author

@javierbertoli Thanks for the changes, this is ready to merge for me, except for the decision about the conflict with #45. What's the plan for that?

I asked @jdkelleher to make a few changes in #45 to make it backward compatible. I think we can merge that one first and then I can fix/update this one.

@myii
Copy link
Member

myii commented May 27, 2019

@javierbertoli OK, so we'll wait for #45 to be updated and merged, then we'll revisit this one. Thanks for accommodating for that.

@myii myii changed the title WIP - Update testing environment, attempt to use new formula format Update testing environment, attempt to use new formula format May 28, 2019
@myii
Copy link
Member

myii commented May 28, 2019

About to merge this but waiting to see what happens with semantic-release because of that one merge commit message...

@myii myii merged commit 13e4569 into saltstack-formulas:master May 28, 2019
@saltstack-formulas-travis

🎉 This PR is included in version 0.8.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants